QueryBuilderDecorator improvements#7

marianofilipoff wants to merge 8 commits intomasterdigbang/utils:masterfrom

feature/query-builder-decoratordigbang/utils:feature/query-builder-decoratorCopy head branch name to clipboard