Fixes to persistence layer to add async search.