clicking on dataset updates to first companion
minor fixes