fix bug
handle null values
Merge branch 'auto-sort' into live