Another work-around for buggy logic of splitting data/query parameters.