Feature/88 course index fields