fix string split usage in all occurrences