rename enum-constants to uppercase
user URIBuilder instead of using string concatenation
use URIBuilder instead of using string concatenation
little restructure for paging builder