removed debug output
new query option