make the subject/tag limit join conditional, to avoid excess rows on non-limit searches
more created/revised fixes in tests