Added clear for admission
Improved search