Merge pull request #430 from xmtp/np/database-fetch-enhancements

Merge pull request #430 from xmtp/np/database-fetch-enhancements #257