reduces queries with deep plugin trees
Merge pull request #2238 from digi604/reduce_queries

reduces queries with deep plugin trees