Feature/fix hh rt lookup