Update on queries and error fallbacks