general cleanups on kvlayer keyword indexing