FEAT: Condensed some code. Added FilterProperties, specifically filename property.