VCategories: Made a small check for categories that seems to resolv the problems in Calender. Also reverts the changes from 9e6221b2.