Improve property handling

Fixes a bug where the $with and $without properties would not be handled appropriately.

Thanks to @sfadschm!