Several fixes to hfilter module.