Fix search column sorting + change labels
Merge branch 'master' of github.com:IntersectAustralia/faims-web