Fixing subject lookups