Clean up to adding search in proper place