Improve .ndpi support

See ticket #5092.