bug fix & behaviours inhancements (discovery on bares only since full are returned too)