Attempt to fix tag sorting