Improve the data browser translation logic.