Changed display of filering stuff as well.