fixed queries again