integrated fieldlist gadget into generic handler, removed fieldlist