Field saving issue fix (missing entry id)