SC4G #61 - Added Location as a filter option