fix js error for upload type filter
Merge branch 'develop' into swipe