changed resolver variable population strategy (only on non-empty contents)
fix: js block variable generation