Add 'near' lookup into main regex and remove split_match override

Looks like I wasted my time sorting out this regex, just noticed you're doing it now.