trying to add support for predefined queries