Removed an unnecessary optimisation and added the option to provide an optimiser for the blocking query execution.
Fixed retrieval of predicates in store by adding a new query type.

Made new optimiser the default.