Minor optimisation when building single field queries