Some mor clean up
Merge branch 'queDetection'