- fixed queries etc