Fix shift-clicking in architect table, fix #1740