Clean-up htid retrieval logic
Comment clean-up
Firm up on extra SSI checks