Fixing a few search issues