Some small query optimisations and a better font / format for money formats.