sorting and tags working
fix merge conflict