Enhancing generic search helper

Callers to the helper need to be able to run all relevant properties
queries Fix the generic search helper to return the actual object found
instead of a summary object with an anemic subset of properties.