Add index teacher and users. CR: GA