note smart list
Merge remote-tracking branch 'origin'
bugsssss fix