Refactor
No 404 on weird ampersands (OPS-3874)
Whitespace
Merge pull request #7 from Work4Labs/olefloch/OPS-3874/no_404_on_ampersand

Olefloch/ops 3874/no 404 on ampersand