fixed filtering on player
resolved conflict