fix list page
merge with develop
fix subscribe field