Enhanced url/keyword detection