More fixes in Ht/HtMht filetrs