Make Search work with v1.1