Limited local search options

Other Waplog issues: