Added package
Tweaks, fixed search string formatting