Added tag highlighting and save after sorting, etc