Fix to show the select clause in the order that was specified by user