Fixed some query modulation