Split EntityLocator axis type into domain and id subfields

Signed-off-by: Tom Wright <tom@inflatablecookie.com>