Fixes in stop list + templates