updated regex search