fixed few bugs and added response with URI