NH: Now lets QueryHelper perform $select and $orderby when $expand is present