Modules

Streamline canned query generation