Update Search moduls 

Use get identifier in wrapper + Use get identifier in wrapper