#18 Optimise database

[Wildrich Fourie]

Attempt to optimise the database even further with the aim of getting all of the requests responded to within 60 seconds time. This might not be possible due the large amounts of data that need to be queried for some requests, especially when setting complex filters.