cleanup/simplification, added queryparam parsing
fixed build error