Too many queries in Calendar module