Replacing empty by empty string comparison to avoid problems with "0" values