Fix orderby_and_scope not returning  correctly
Code comments
Merge