Updating to new Subsets API.
Fixing KVP subset regex and parsing.
Fixing to new Subsets API.