Merge pull request #542 from mbertrone/master

http_filter fixes