Advanced search fix