Disabled async tag updates. Smaller refactorings