Our OCP on AWS resource id matching SQL does not exclude blank resource ids and ends up matching MANY additional rows when resource id is blank.