clean up new filter page, use labels