Modified the logic so that NULL, empty and white space strings are all treated the same for comparison purposes, as "[Empty]".