Multi select example and other minor changes