Adding sorting to remote as well