Complete optimise search widgets