Actually fix loading and empty view visibility weirdness