Fixing tag-sort
Merge branch 'development' into sort_with_tag