Fix Some Bug

focus reture data for id