fix notFields and empty-fields list