Added location filtering for users