updated machado - search style tweaks