lots of work to suppor the new Query API in Blueprints.