issue24, seperated search functions into their own template