Working on search some more