fixes to make query interface work on mobile