added classification info for hATw elements
reconfigured the final TIR search