Adding query by subject support