Changes to make-plist to handle other keys
merged lookup into search module
Adapting to make-plist changes.