More work to be done to tackle discrimination, says UK PM Johnson