improve billing and index on mobiles