Use separate builder for filter html

@rogatty @aquilax @nandy-andy