Improve to support ubuntu 14.04, and spaces on search