Fixed bug in how "notEmpty" was handled