foreign content bug fixes