Add property name structs, improve account store filtering