Filter stuff with changes from yedi