Code cleaning

TODO: workaround SearchView.onCloseListener not called since ICS
(Android bug)