Ensure indexing by feature id is consistent throughout.

+ some missing test.
Merge pull request #389 from ambiata/topic/indexing

Ensure indexing by feature id is consistent throughout.