Add in billy's id filtering scheme