Fix id lookup

Hi,

my last improvement was a little bit too "drastic" so I decided  to move it to case-insensitive filter only.

Very best,
Pierre