Allow shorter queries as well