Database call should be made with only the necesary info needed

[lescuer97]

A lot of database functions are being passed entire functions when they don't need them. They should be streamed lined.