Modify search to use regular expressions