Adding some fixes for handling empty string handling.