further cleanup + searchQuery