Made changes to index. Fixed wrap id issue