add initial search query support