#50 merge Search Dialog to Replace Dialog and remove Search Dialog