Fixed blocks and grep issue