extended & fixed queries