cleanup resolvers, change creating of hierachy for content and tags