Would it be possible to have the flagging upgrade require a keypress being held down to function? I/E having to hold Shift and then bump into a cell to flag it.
The fact that just touching a cell flags it, but you also bounce back when doing so makes tight corridors a pain to deal with with this upgrade.