Feature/fixing mixed content