Issue #2218065 by jhodgdon, dawehner: Fixed Need to join fields to the entity field data tables, not entity tables, or filtering increases number of results.