Fixing checkbox

Updated to pass in the properties map so I can check if the property actually exists and use a default value