Fix id filtering