Replace Inclusion.NON_NULL to NON_EMPTY