Fixed filter-entities.

This has the right combination of musts and shoulds.

Includes example searches in raw elasticsearch format.