Make a few changes, properly return searches