Various data explorer fixes