Search box improved