changed search method
updated search classes