Add conventions to explicit queries as well