Fix sort by seat bug.
Merge branch 'wzp-local'