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