add `id` as a valid sort field
Merge remote-tracking branch 'origin/master'