first draft of search regexp updates