substitute `?` for `$` at the end of these two regex's