Apply fixes for importing content from external content

#4128 
![screenshot from 2013-10-21 12 09 22](https://f.cloud.github.com/assets/1222368/1371063/31501802-3a31-11e3-932c-2cd2304d9b21.png)