Fix performance issues on datasets and employees pages
Merge branch 'rails' into ec2