Search fixes
Bug Fixes