filter & form fix