Fix when order column is not named 'sort_order'
Merge branch 'patch-1'