Fixing instance key filtering