New handling of libs fixed and Search feature will take first choice