Fixes some issues during import database with forms table rebuilding