Fix URL again. TODO use javascript for this