Fix building count, considers relation now