Remove distinction between regex and string match key

Remove distinction between regex and string match key #99