Renamed search include and bulletproofed template a bit