CB-3208 fixing index + prompt response