WidgetQueryBuilder was improved, added method buildQuery(Widget widget)