Fixed hierarchical resolution with new collecting parameter
Simplified the code int he ContextFactory CollectFieldDetails method