Set filtering to false for everything except version.prop
Added missing null pointer check