Fix constructed protocol query