Search fields and template corections