Changes made as per autocomplete requirement