differentiate between incoming and outgoing query
fixed the locator link : internal.properties change!!!
test to be fixed