added index for a8 and email class bug fix