Fixed qury for courses/users. Started implementing chapters