[en] add more conditions to TO_NON_BASE (some addtions thanks to Kumara Bhikkhu)