entity store local search fixes