MT#8371 Fix for optimized query build

Remove double join for billing_mappings