Refactored adapters
Fixed team filter