Fix search, add in templates