Fix/optimise non-urlgroup URL querying