removing type value check and replacing with .has_key('type') instead

@khacanh - removing the type value check for 'plain', which is too restrictive