Fixed HTSO logic
Requiire matchmap