Make queries immutable