several improvements in querybuilder collector
resolve entity repository shortcut name and querybuilder root