Fix sorting
Merge branch 'master' of github.com:hananils/association_ui_selector