fixes to GET handler