Issue #2366631 by colan: File Entity select uploaded file loc & fix replace code + Update Media