DAX Average & Model issue

Hi 

I am trying to visualise the average repairs spend for all properties in a visual table. I would like to still see the property that have no repairs. Also when I filter the types of repairs. I still which to see all the properties and only the avg spend result change

hope I have explained that ok

I have a model that contains 2 tables. Tabe 1 = Properties. In the example below there are 5 properties (one property per row)

Table 2 = Repairs (Many repairs per property)

I have 2 measures

Spend := SUM(Repairs[Spend over 5 years])

Average Spend =AVERAGEX(VALUES(Property'[Property Ref] ),
  DIVIDE([Spend],5))   // Avg spend over 5 years

The model looks like this

The first issue is when I display the results in a visual table the property that has no repairs / spend information is missing (Property Ref 4)  I need to see this row but with £0

The second issue is that when I filter the table visual by Trade (Repairs table) the properties that do not contain repairs with this type of trade dissapear.

What I would expect to see firstly would be this

And when I filter by trade I would expect to see this

thanks

Richard