fix index and billing