Use separate builder for filter html

@rogatty @aquilax @nandy-andy 
The devil got in here ;)