Add instant-message and email terms, add genre condition for limited test of field content