Feature/js disable