allow to search for by both id and org