Fix/optimise non-urlgroup URL querying

After consultation with @jpawlyn we agreed* that the following form was better

* Jolyon fixed it.