fixed selection/probing bugs

Change-Id: I0665e1df73a5647eb268d0057c9c4692f2f75ca3