Bubble search in both directions

@Elmira88 

Sorry the previous PR was against the wrong base branch.