Better skill filtering