Building query plans simplified a lot. Fixed an installation problem.