Improved fixups. Tokenizing partition_name:set_id is now faster