Search fixed, potential final build