Added defaults to instrument filter entityref_filter refs #2320