Crawler fix and regex