modified search to use separate data store