Issue #1550454 by tim.plunkett, xjm: Fixed Regression: Following taxonomy entity conversion, Taxonomy EFQ causes warnings and notices.