Refactor query form for better keyboard use, close #16.