Fix for DIRAPI-107. We now enforce value type (HR/not HR) accordingly to the previously parsed values.