Improved behavior when adding media (position/selection)