Fixes and improvements on contacts selection