Make fixes into middleware__router module according to notations of @tadatuta
Make fixes into dynamic.js model module according to notations of @tadatuta