Fixed issues with customized output

The price is less nice code in that branch. Hmmm...