Changed structure of settings array
Remove fields key on count queries