Upload of search controller & Template updates -- issue with default form types