Fix intent for api, fix slection dialog in demo