Taking community default locations into account a little bit better