Apply slop correctly if phrase query is wrapped in a filtered query.

If a phrase query is wrapped in a filtered query due to type filtering
slop was not applied correctly. Also if the default field required a
type filter the filter was not applied.

Closes #4356