Updated functions to include regexmatchonly setting