Revised data model, targeting search controller now