Minor bug fixes with AQI loading