CB-4966 fixing index + prompt response