added index for user_id
merging pull