Fix query modifier