fix merge problem in newsearch template