Fix regex for isrequestid triggers and add to schema