Fix public_id filtering (bug 834344)