Search mostly works now. Tidied up some templates