more query ui cleaning