fixed queries with missing subjects