HLT menu fixes and extraction fixes