Fixed sorting, toggling issues.