[BUG #7777] Fixed return types for data sets.
[BUG #7777] Fixed return type for browsers without dataset support