Small fixes to DB engine

Separated the queryFields further.