Make ad-hoc views configurable, and disabled by default