Use resource_type_id instead of types.resourceTypeGeneral when filtering

Use resource_type_id instead of types.resourceTypeGeneral when filtering #525