restored old search functionality