--watched fixes

* sorting didn't work if one used friendlyNames+Platform
* more encoding fixes for excluding/including users with special characters