basic fixes
listing structure change