fixed m2m property filters and display fields

The current properties implementation is certainly ugly, and this commit doesn't help, but it seems to work for me.  It should probably all get refactored, at some point.

Feel free to reject this pull request and I'll just stay forked until I can get around to a refactor.