Cleaned up importData and search pages