Few fixes for search