- [ui-query] some improvements on structure-query.