Minor query-form fix-ups.