Make the template and search widget work more like the scaffolding expects