Fixed database fetch calls