improving match regexp for search=