Ugh, let's stop passing the container around and just get the db instance from the container in the controller.
Bringing all code in line with new database results format. Sundry tweaks.