Fix shape-path sample, adds sample for multiple annotations