Added additional GRAPH clauses to selectors so that we can order by variables in those clauses