Merge "Fix the wrong condition in querySupportedValues"