better handling of member search