Fix completion type

Add a check to skip adding any default properties to certain field types.