some fixes for search; some more