Fixes in Client-Side-Sort