Fixed regular expressions to only match on entire string