updated: check entity type from second word as well
updated: check entity type from second word as well

AndreasHae/iD,openstreetmap/iD,kartta-labs/iD,morray/iD,AndreasHae/iD,openstreetmap/iD,digidem/iD,AndreasHae/iD,morray/iD,kartta-labs/iD,kartta-labs/iD,openstreetmap/iD,digidem/iD