Fixed code type and added isCommandEl