Improving performance via find_each and includes()

Addresses https://github.com/spree/spree/issues/4459