Fixing including/includes_for

AR includes clones the relation so we need to update the query with the result of calling includes so they aren't lost.
Updated find_model_instance to use the includes as well and refactored it into a single method since they were essentially the same.