Client side:
- Introduced 'URI' field as a possible clause
- Fixed split to split only the first occurence