Removed hard coded search