restore static, and fix plugin collection
app rather than plugin