Added handling of single-feature results