add optional location to lists, fixing #8;