Better handling of get Intent Extra