Add search so its correctly encoded