Remove usage of "id_block_tag_class" and "id_block_tag_number"