Fix so it will build
Merge branch 'working'
ANother query bites the dust ;-)
Merge branch 'working'