Bugfix/167 alphabetical sorting