standardise the basic queries for the two current locations, must
convert them so they are not redundant in the near future.