zend cleanup, search updates and some minor whoops patches