Fix incorrect tile class replacement, expand breadth