Fix: #1408 Issue with HDTS not being categorized properly