Fixed query paths
Fixed regex
Added client stub files