Fixed issues with index building value retreival.