Make a distinction between trimmed and full versions of queries. Fixes intermine/intermine#584