Fix NPE
Avoid marking custom tokens as NonHebrew
Cleanup