Improve load times, decrease number of SQL queries [MJ-369]