Feature/448 url fields clean

Rebased version of #495 .

I also fixed a duplicate numbering issue - we had two questions 41. Now the one after 41 is 42.