Proper inernal search interfaces

Note: The search will not work. Probably.