Combine database requests to optimize load time
Merge pull request #104 from gitMbar/dev

Combine database requests to optimize load time