fix: filtering now happening in property when possible