Add proper tag sorting