TEMPORARY: overlay: Compensate for incomplete featureset