Changes to handle few search interface bugs!