added better search and uniform templates