further bug fixes (related to search)