URBNG-153 - [WP] refactor WebService to final version