Fix autocomplete not allowing to insert char

if next char is the same, should only do that for the char that
exists in MAPPING
Merge branch 'refs/heads/develop' into develop2