Fix query took wrong entry
Cleanup, fix courseviewmodel, delete trash