FIX: HLTB and WSGF formatting fix