Added search form baking