fix a snarl in query construction