Fixed multiple store entrys when selecting previously added store