Revert "re DE2922 make a special exception for not being able to find an entity type in order to avoid abusing the EntityNotFoundException, use it in the SearchResourceSerice, and handle it to make HTTP requests give HTTP 404 not found when it happens"

This reverts commit 90f1047f6918d74d6f00c9d3c293dedf98ca12e1.
reverted back to andrews code