added index to couple of fields