Non-oil income takes larger share as public debt climbs to BD22.16bn