[imp]:improve query