! add location consideration for query