#948 Optimizations to avoid Error 502