fix query
Merge commit 'b9ab1a1629b4cfcbee72e4836b893c63cf8b77be'

Conflicts:
	manual.py