Indexed properties aren't always properly queried across relationships

[Matt Luongo]

As evidenced by the tests added (and adjusted) in #205 and #209.