Updates from server

Don't produce by_hierarchy it gitaggregate
Disable updated function because its problematic