Updated to remove team filter logic in views