Need to refine the url and make search