fixed query expression, not sure if it's valid