OFC-1355 - Improve survey import