JARVIS-284 Fixed issues with xAxis labels