Reverted to first solution

The last solution integrating userState introduced a new issue where the ordering field was hold even when not passed in. So the userState is dropped again and the ordering field is evaluated on every page load.