Fix & Improve

Debugging, refactors and fixing things that aren't working.

Restore the last working behavior, keep recent good work and customer data, then reapply only the change you wanted.

Reduce duplicates, abandoned pieces and inconsistent behavior while keeping the app's working features, data and URLs intact.

Turn the exact error you can see into a small, tested fix without rewriting working parts of the app.