Fixes in result template
All needed routes already defined (hopefully)