Fixed js and added indexes for email
Merge branch 'hotfix/0.2.32.3'