moved the check of URI param 'empty' to general place in RestService. Fixed a few 'present'