auto select building fixes