Enhance querybuilder
Enhance field state