More RemoteDataStore refactoring!

Use a generic method to remove duplicate code for queries that return a search result list.

This removes a bunch of duplicated code.