[adam] fix billing jp for aso - now with more fixes