Issue #15, subject search working