rhbz987707 - Replace outdated (and invalid) use of natural Id search.

Searching by a class that did not have a natural Id. Replaced with a criteria query.