handle better search with space