Add NO_SIM_MATCH param + fix sim match wording