CLN: narrow queries a bit