rework regex locations