Fixed some db import issues related to multiple teams