Improve start action in source kind
Fix choose