DataExplorer bug fixes