BF - separate out storing of fit values in gqi

This should be ok for a short term fix.