clean up
fix multi select bug