fix duplicates and wrong order in search everywhere
cleanup