Enhance querybuilder && datagrid