Work for all entity types

jayhuskins → closed merge request !2

Hi - the merged request appears to be largely mine with some modifications. Could I please get shared credit on it?

Ah, I see I do have credit on the issue, but was not credited as part of the git commit message.

Apologies, that was my mistake. I realized immediately after pushing that you had been left off the commit message, but made sure you got credit for your work on this issue.

Automatically closed - issue fixed for 2 weeks with no activity.