Add query passthrough, query requesting, templates, display