fix #13 - orderby clauses were not being correctly freshened