fix range subject code and add regex email