Fix performance issues on datasets and employees pages