Added dynamic type and empty search option