Added the ability to query by the general location groupings
Adding the lookup table
Adding beat to the things that need comma separation