Fixed issue #789: Now on unresolved objects redirect user to the 404 page.
Replacing usage of  with  everywhere