Fixed THT new layout crawling