Refactor query generation (GH-1)
Search box mockup