Added empty search UI options (some of this was in 85d9c8c5ce4d91c45c61c70cacf3f1eb88405034 ) oops