Resolved the remaining issue with persistence of selection - should work
correctly now.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>