Initial fix for data pre- and post-processing to handle presense of the data separator in the data itself (added handling of "X::Y" and "X:: " cases).