removed buggy search