Further updates to the search function, think this is stable enough to give it a small run.