remove one abstraction layer from query types