Errors in Sinhala Typing

There are few errors with Sinhala language typing. As for an example, ෙම ෙක ෙව අා අැ අෑ ෙව ෙස Etc... They should be arranged like this, වෙ සෙ කෙ ඇ ඈ මෙ චෙ රෙ බෙ ලෙ ටෙ etc... Please fix it. I have reported this issue before also. Hope you guys will sort this out.