Bug Fixes and added filtering back to import routines