Check id matches current selected before updating UI. Issue: #603