Made Search more intuitive