Add working search
Add unregister