Conclusion from office hours: 1. We should revert the PR that introduced is_hidden. This fixes the immediate performance regression for release 2. We should file a larger issue WRT query planning and caching and whatnot.