fixed queries again again