Added fixed number and email spans