Added fixes for verb manipulation based on index