changes for non-/ context path
handle empty params