Remove query processing logic specific to HT* numbers (closes #140)