Updating regex queries before I start doing exceptions