Fixed search & reduced complexity.

Broken on upper-case searches; search with the (already lower case)
package key.