- [ui-query] few improvements