Fix #1320 - Group containers via "location" property