Improve to show Query Plan