Fixed Null Reference execption
Removed Dynamic Query again and added FindPropertiesByKeys instead as a way to look up alternative properties.