Fixed regex false positives
Fixed hash lookup concurrency issue