Use new rank view everywhere the old annotate_with_rank call was used.

Use new rank view everywhere the old annotate_with_rank call was used. #791