fix state saver, query params