Adjust Query interface