Added the ability to query by the general location groupings