Configured road fields
Tidy up address query