Small change to object indexing to prevent empty keywords