Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Use `||` instead of `or`.<br>Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.