fix search in firefox
Merge origin/ardfo into ardfo