The search needed more work. Looks good, now. Need to test with localization.