use OCP namespace, fix search