Fix VisualIndexHandler