Updated database loading in the controller (via Debjit Saha <debjitsaha87@gmail.com>)