search fix in progress