Fixed so collection only shows the fields that are in the page type when you add new fields and started moving "_property" to own definition