While working on the queries implementation, I noticed I'd somehow flipped the logic backward for the performance optimization I did for Bert last month (shouldRemoveGarbageCollectedEntries), negating the performance improvement, sigh. It's really fixed now..! It also includes the new backup method requested by Göran. Enjoy, Chris