Improve html Filter class