Release 212

Fix performance problems by braking queires