Do not tolerate null anything.
Made kw search page work again
Fixed wrong package name
More error fixing
removed dead code