Make Jons files/node term code compatable with nodeorder

I am not 100% sure about the performance impact of structuring the query like this.  I would like to make sure the index is used. #5603