Flushing out the logic a bit more to handle URLs correctly FEND-1137