Fixing small issues regarding normal back and forth search