4a8e51c3c9
Fixed: 'extra' entries would override database entries if they shared the
same token
Fixed: 'extra' entries would override database entries if they shared the
same token