Novak Djokovic looks to be back to his best at the French Open and will play Cam Norrie for a place in the quarter-finals.