SONAR-4449 Fix SQL returning issues with all columns