Fix CS from scrutiniser-ci
Move query logging into its own method
move classes to parametes