Slightly better re-select notes behaviour, still needs more work...