Figured out what was wrong with regular expressions earlier and added them back