add s mapping
comment out exclude app
tags plugin change back