Expand responsiveness to going/return and Fix search one