added property filtering feature