Fixing bug with property filtering