Avoid errors due to empty jslibs
Fix markup + block name