Made some changes to SearchElement