searches returning null plus library cleanup