Fix org+loc selection method