Blocks and tags model fix