Fixing sorting on registration time
Adding a few escapes