added froms and cleaning repetaed searchs