EST-248: move location from fixed asset to property