rewrite for data-m-timeout, no img dependencies behavior fix