improving execution plan to facilitate query list and definition map