Fixed things for clean url