updated search with label + remove feature