Update the calculations for the HHQ-F variables to use the correct component variable