fixing metadata display & linking of properties