Fixed Feature Importer (with template) bug and applied the same fix (work around) on some other places