Improve html code of filter form