#948 Fix issues with img and url