DbQuery is not fixed 1

DbQuery is not fixed 1
DatabaseQuery fixed for entity but not tested

DatabaseQuery fixed for entity but not tested