Fixed some bugs, works now for all EWI opleidingen