1. Create JOIN object after query preparation.
2. Refactor query execution so that interfaces become simpler.

See LLD for detailed description of changes.