added location filtering tracking