Fix for DataExplorer page hangs issue #2186

Incl. corner cases