adjusted formatting
added source tracking if part of url