Added logic for mapping clues to their numbered clues