Object-based searching. With maintenance by @radar and @jonatack!