Fix for broken data explorer after design changes