more cleaning on tag , control block matching