Updated database controller for better find behavior