Fix case when index has same name as keyword