Fixed search; simplified markup slightly