fix container mapper factory
fix hold origin url when it was shortened.