Temp solution - moved sortation watcher to wp controller.

Also copied over available columns caching from columns branch.