Ensure indexing by feature id is consistent throughout.

+ some missing test.