Improve & Refactoring multibyte handling
Improve <Space> expression