improve canned queries