search fix 2.1