Added better handling for parsing single value
Case when single value is not found
Upgraded version