Improve to support ubuntu 14.04, and support spaces on search box