Added filters for location and primary crime type Relates to #1