View and data import fix