Fix Comment / Story association mapping