Changes for location filtering.