Support for key-only queries (returns key components and id); Fixes delete index regression