Dictionaries refactor, lower letters and fix problem with special chars