Fixed `make-join-plan' work
Query implementation
Key planning refactored