Added some improvements to the pr for "empty value" use case