Added location filtering