Making some fixes for values to be loaded from qvalues variable