Thanks for the changes - very helpful!
I have a suggestion about the cache type though...I always manually change the cache type to virtual. We have many events in our area and that can get confusing. Virtuals, however, are becoming more and more rare as they can't be created anymore and are slowly be archived by reviewers if the owners are no longer active.