Fix unmark bug and set new import rules