Updated property templates and small improvements to property SparQL query.