fixed filter logic and layout/label