Revised search search

Just doing some soul searching