Fix ordering of MultiQueries. Start working on extra_select support