ENH: define the order of resolution for index vs columns in query/eval

closes #6676