making it backward compatible
adding fallback for type_id miss
more tests