Fix spot layer to work with single feature
Merge remote-tracking branch 'origin' into spot-fix