Minor change to handle Strings if only one column is selected and test cases for the required tasks.