More work to allow multiple taxonomy terms through.