Fix regex when dealing with ? character