Make Spotlight remover smarter