Sorted out the search a bit.