Fixes for add/remove query blocks